diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53705e2fc4..a03520d5f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added a button for deleting all regions ([#1040](https://github.com/CARTAvis/carta-frontend/issues/1040)).
 * Added support for loading remote FITS files from the hips2fits server ([#1379](https://github.com/CARTAvis/carta-backend/issues/1379)).
 * Supported the customized rest frequency for the moment maps ([[#2396](https://github.com/CARTAvis/carta-frontend/issues/2396)]).
+* Supported image coordinates for images with valid WCS headers ([[#2366](https://github.com/CARTAvis/carta-frontend/issues/2366)]).
 ### Fixed
 * Fixed ruler annotation matching bug ([#2242](https://github.com/CARTAvis/carta-frontend/issues/2242)).
 * Fixed compass and ruler annotations update bug in the spatially matched image when changing the coordinate ([#2270](https://github.com/CARTAvis/carta-frontend/issues/2270)).
diff --git a/src/components/Dialogs/OnlineDataQueryDialog/CatalogOnlineQueryComponent.tsx b/src/components/Dialogs/OnlineDataQueryDialog/CatalogOnlineQueryComponent.tsx
index ec37fea70f..cf76435585 100644
--- a/src/components/Dialogs/OnlineDataQueryDialog/CatalogOnlineQueryComponent.tsx
+++ b/src/components/Dialogs/OnlineDataQueryDialog/CatalogOnlineQueryComponent.tsx
@@ -144,7 +144,7 @@ export class CatalogQueryComponent extends React.Component {
                 </FormGroup>
                 <FormGroup inline={false} label="Center coordinates" disabled={disable}>
                     <Select
-                        items={Object.keys(SystemType).map(key => SystemType[key])}
+                        items={Object.values(SystemType).filter(sys => sys !== SystemType.Image)}
                         activeItem={null}
                         onItemSelect={type => appStore.overlayStore.global.setSystem(type)}
                         itemRenderer={this.renderSysTypePopOver}
@@ -236,7 +236,9 @@ export class CatalogQueryComponent extends React.Component {
                     <div className={Classes.DIALOG_FOOTER_ACTIONS}>
                         <AnchorButton intent={Intent.WARNING} disabled={!configStore.isQuerying} onClick={() => CatalogApiService.Instance.cancelQuery(configStore.catalogDB)} text={"Cancel"} />
                         {configStore.enableLoadVizier ? <AnchorButton intent={Intent.PRIMARY} disabled={disable} onClick={() => this.loadVizierCatalogs()} text={"Load selected"} /> : null}
-                        <AnchorButton intent={Intent.SUCCESS} disabled={disable} onClick={() => this.query()} text={"Query"} />
+                        <Tooltip content={"Please select WCS coordinates"} disabled={appStore.overlayStore.isWcsCoordinates} position={Position.BOTTOM} hoverOpenDelay={300}>
+                            <AnchorButton intent={Intent.SUCCESS} disabled={disable || appStore.overlayStore.isImgCoordinates} onClick={() => this.query()} text={"Query"} />
+                        </Tooltip>
                     </div>
                 </div>
             </div>
diff --git a/src/components/Dialogs/WorkspaceDialog/WorkspaceDialogComponent.tsx b/src/components/Dialogs/WorkspaceDialog/WorkspaceDialogComponent.tsx
index 0298ba1d2a..ac829e3114 100644
--- a/src/components/Dialogs/WorkspaceDialog/WorkspaceDialogComponent.tsx
+++ b/src/components/Dialogs/WorkspaceDialog/WorkspaceDialogComponent.tsx
@@ -8,7 +8,7 @@ import moment from "moment/moment";
 
 import {DraggableDialogComponent} from "components/Dialogs";
 import {WorkspaceListItem} from "models";
-import {AppStore, DialogId, HelpType} from "stores";
+import {AlertStore, AppStore, DialogId, HelpType} from "stores";
 
 import {AppToaster, ErrorToast, SuccessToast} from "../../Shared";
 
@@ -67,6 +67,12 @@ export const WorkspaceDialogComponent = observer(() => {
                 return;
             }
 
+            // TODO: to be removed after storing SystemType in workspace
+            if (appStore.overlayStore.isImgCoordinates && appStore.frames.map(frame => frame.spatialReference !== null).includes(true)) {
+                AlertStore.Instance.showAlert("Saving workspace failed: not supporting spatial matching in image cooordinates.");
+                return;
+            }
+
             setIsFetching(true);
             try {
                 const res = await appStore.saveWorkspace(name);
diff --git a/src/components/ImageView/Overlay/OverlayComponent.tsx b/src/components/ImageView/Overlay/OverlayComponent.tsx
index 9d9bcb0ec5..5615eb2f92 100644
--- a/src/components/ImageView/Overlay/OverlayComponent.tsx
+++ b/src/components/ImageView/Overlay/OverlayComponent.tsx
@@ -70,11 +70,11 @@ export class OverlayComponent extends React.Component<OverlayComponentProps> {
                 const scaleMapping = AST.scaleMap2D(1.0, 1.0 / frame.aspectRatio);
                 const newFrame = AST.frame(2, "Domain=PIXEL");
                 AST.addFrame(tempWcsInfo, 1, scaleMapping, newFrame);
-                AST.setI(tempWcsInfo, "Base", 3);
-                AST.setI(tempWcsInfo, "Current", 2);
+                AST.setI(tempWcsInfo, "Base", frame.isOffsetCoord ? 4 : 3);
+                AST.setI(tempWcsInfo, "Current", frame.isOffsetCoord && OverlayStore.Instance.isImgCoordinates ? 3 : 2);
             }
 
-            if (frame.isOffsetCoord) {
+            if (frame.isOffsetCoord && OverlayStore.Instance.isWcsCoordinates) {
                 const fovSizeInArcsec = frame.getWcsSizeInArcsec(frame.fovSize);
                 const viewSize = fovSizeInArcsec.x > fovSizeInArcsec.y ? fovSizeInArcsec.y : fovSizeInArcsec.x;
                 const factor = 2; // jump factor
@@ -214,7 +214,7 @@ export class OverlayComponent extends React.Component<OverlayComponentProps> {
             const formatStringX = this.props.overlaySettings.numbers.formatStringX;
             const formatStyingY = this.props.overlaySettings.numbers.formatStringY;
             const explicitSystem = this.props.overlaySettings.global.explicitSystem;
-            if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined) {
+            if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined && OverlayStore.Instance.isWcsCoordinates && frame.validWcs) {
                 AST.set(frame.wcsInfo, `Format(${frame.dirX})=${formatStringX}, Format(${frame.dirY})=${formatStyingY}, System=${explicitSystem},` + dirAxesSetting);
             }
         }
diff --git a/src/components/ImageView/Toolbar/ToolbarComponent.tsx b/src/components/ImageView/Toolbar/ToolbarComponent.tsx
index 5c53dce1c2..972aad558f 100644
--- a/src/components/ImageView/Toolbar/ToolbarComponent.tsx
+++ b/src/components/ImageView/Toolbar/ToolbarComponent.tsx
@@ -33,7 +33,8 @@ export class ToolbarComponent extends React.Component<ToolbarComponentProps> {
         [SystemType.FK4, "FK4"],
         [SystemType.Galactic, "GAL"],
         [SystemType.Ecliptic, "ECL"],
-        [SystemType.ICRS, "ICRS"]
+        [SystemType.ICRS, "ICRS"],
+        [SystemType.Image, "IMG"]
     ]);
 
     private static readonly CoordinateSystemTooltip = new Map<SystemType, string>([
@@ -174,6 +175,7 @@ export class ToolbarComponent extends React.Component<ToolbarComponentProps> {
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Galactic)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Galactic)} />
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Ecliptic)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Ecliptic)} />
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.ICRS)} onClick={() => this.handleCoordinateSystemClicked(SystemType.ICRS)} />
+                <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Image)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Image)} />
                 <FormGroup inline={false} className="offset-group">
                     <Switch className="offset-switch" disabled={frame.isPVImage || frame.isSwappedZ || frame.isUVImage} checked={frame.isOffsetCoord} onChange={frame.toggleOffsetCoord} label="Offset" />
                     <Collapse isOpen={frame.isOffsetCoord}>
diff --git a/src/components/Shared/CoordNumericInput/CoordNumericInput.tsx b/src/components/Shared/CoordNumericInput/CoordNumericInput.tsx
index 0a510a7659..bd52edbd63 100644
--- a/src/components/Shared/CoordNumericInput/CoordNumericInput.tsx
+++ b/src/components/Shared/CoordNumericInput/CoordNumericInput.tsx
@@ -131,6 +131,6 @@ export const CoordNumericInput = ({coord, inputType, value, onChange, valueWcs,
     if (coord === CoordinateMode.Image) {
         return <ImageCoordNumericInput inputType={inputType} value={value} onChange={onChange} disabled={disabled} customPlaceholder={customPlaceholder} />;
     } else {
-        return <WcsCoordNumericInput inputType={inputType} valueWcs={valueWcs} onChangeWcs={onChangeWcs} disabled={disabled || wcsDisabled} customPlaceholder={customPlaceholder} />;
+        return <WcsCoordNumericInput inputType={inputType} valueWcs={valueWcs} onChangeWcs={onChangeWcs} disabled={disabled || wcsDisabled || AppStore.Instance.overlayStore.isImgCoordinates} customPlaceholder={customPlaceholder} />;
     }
 };
diff --git a/src/stores/Catalog/CatalogStore.ts b/src/stores/Catalog/CatalogStore.ts
index 617c86564b..4b994a9103 100644
--- a/src/stores/Catalog/CatalogStore.ts
+++ b/src/stores/Catalog/CatalogStore.ts
@@ -324,6 +324,9 @@ export class CatalogStore {
             let yFraction = CatalogStore.GetFractionFromUnit(yUnit.toLocaleLowerCase());
 
             let wcsCopy = AST.copy(wcsInfo);
+            if (wcsCopy !== 0 && AppStore.Instance.overlayStore.isImgCoordinates) {
+                AST.setI(wcsCopy, "Current", 2);
+            }
             let system = "System=" + catalogFrame;
             AST.set(wcsCopy, system);
             if (catalogFrame === CatalogSystemType.FK4) {
diff --git a/src/stores/CatalogOnlineQuery/CatalogOnlineQueryConfigStore.ts b/src/stores/CatalogOnlineQuery/CatalogOnlineQueryConfigStore.ts
index e5525a587d..abb08c9e95 100644
--- a/src/stores/CatalogOnlineQuery/CatalogOnlineQueryConfigStore.ts
+++ b/src/stores/CatalogOnlineQuery/CatalogOnlineQueryConfigStore.ts
@@ -260,7 +260,7 @@ export class CatalogOnlineQueryConfigStore {
 
     @computed get searchRadiusInDegree(): number {
         const activeFrame = this.activeFrame;
-        if (activeFrame) {
+        if (activeFrame?.validWcs && OverlayStore.Instance.isWcsCoordinates) {
             const requiredFrameView = activeFrame.requiredFrameView;
             const diagonal1 = this.calculateDistanceFromPixelCoord({x: requiredFrameView.xMax, y: requiredFrameView.yMax}, {x: requiredFrameView.xMin, y: requiredFrameView.yMin}, true);
             const diagonal2 = this.calculateDistanceFromPixelCoord({x: requiredFrameView.xMin, y: requiredFrameView.yMax}, {x: requiredFrameView.xMax, y: requiredFrameView.yMin}, true);
diff --git a/src/stores/Frame/FrameStore.ts b/src/stores/Frame/FrameStore.ts
index 6507a83ac7..87f938e205 100644
--- a/src/stores/Frame/FrameStore.ts
+++ b/src/stores/Frame/FrameStore.ts
@@ -1366,6 +1366,8 @@ export class FrameStore {
             }
         }
 
+        this.updateWcsSystem(this.overlayStore.numbers.formatStringX, this.overlayStore.numbers.formatStringY, this.overlayStore.global.explicitSystem); // for image coordinates selected
+
         if (!this.wcsInfo) {
             this.logStore.addWarning(`Problem processing headers in file ${this.filename} for AST`, ["ast"]);
             this.wcsInfo = AST.initDummyFrame();
@@ -1506,9 +1508,21 @@ export class FrameStore {
 
     updateWcsSystem = (formatStringX: string, formatStyingY: string, explicitSystem: SystemType) => {
         if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined) {
-            if (!(this.isPVImage && this.spectralAxis?.valid) && !(this.isSwappedZ && this.spectralAxis?.valid)) {
-                if (this.validWcs && this.wcsInfo) {
+            if (!(this.isPVImage && this.spectralAxis?.valid) && !(this.isSwappedZ && this.spectralAxis?.valid) && this.validWcs && this.wcsInfo) {
+                if (explicitSystem === SystemType.Image) {
+                    // Use base frame for image coordinates
+                    AST.setI(this.wcsInfo, "Current", 1);
+                    if (this.wcsInfoShifted) {
+                        // Use third frame for shifted image coordinates
+                        AST.setI(this.wcsInfoShifted, "Current", 3);
+                    }
+                } else {
+                    AST.setI(this.wcsInfo, "Current", 2);
                     AST.set(this.wcsInfo, `Format(${this.dirX})=${formatStringX}, Format(${this.dirY})=${formatStyingY}, System=${explicitSystem}`);
+                    if (this.wcsInfoShifted) {
+                        AST.setI(this.wcsInfoShifted, "Current", 2);
+                        AST.set(this.wcsInfoShifted, `Format(${this.dirX})=${formatStringX}, Format(${this.dirY})=${formatStyingY}, System=${explicitSystem}`);
+                    }
                 }
             }
         }
@@ -1920,7 +1934,7 @@ export class FrameStore {
         let cursorPosWCS, cursorPosFormatted;
         let precisionX = 0;
         let precisionY = 0;
-        if (this.validWcs || this.isYX || this.isPVImage || this.isUVImage || this.isSwappedZ) {
+        if (((this.validWcs || this.isYX) && this.overlayStore.isWcsCoordinates) || this.isPVImage || this.isUVImage || this.isSwappedZ) {
             // We need to compare X and Y coordinates in both directions
             // to avoid a confusing drop in precision at rounding threshold
             const offsetBlock = [
@@ -2095,7 +2109,7 @@ export class FrameStore {
 
     public genRegionWcsProperties = (regionType: CARTA.RegionType, controlPoints: Point2D[], rotation: number, regionId: number = -1): string => {
         const centerPoint = controlPoints[CENTER_POINT_INDEX];
-        if (!this.validWcs || !isFinite(centerPoint.x) || !isFinite(centerPoint.y)) {
+        if (!this.validWcs || !isFinite(centerPoint.x) || !isFinite(centerPoint.y) || this.overlayStore.isImgCoordinates) {
             return "Invalid";
         }
 
@@ -2178,14 +2192,24 @@ export class FrameStore {
             this.spatialReference.createWcsInfoShifted();
         } else {
             if (this.wcsInfo && this.offsetCenter) {
+                if (this.wcsInfoShifted) {
+                    AST.deleteObject(this.wcsInfoShifted);
+                }
+
                 const centerInRad = getUnformattedWCSPoint(this.wcsInfo, this.offsetCenter);
 
                 if (centerInRad) {
-                    this.wcsInfoShifted = AST.createShiftmapFrameset(this.wcsInfo, centerInRad.x, centerInRad.y);
+                    this.wcsInfoShifted = AST.createShiftmapFrameset(this.wcsInfo, centerInRad.x, centerInRad.y, this.offsetCenter.x, this.offsetCenter.y);
                     for (const frame of this.secondarySpatialImages) {
                         const frameCenterInRad = getUnformattedWCSPoint(frame.wcsInfo, frame.offsetCenter);
                         if (frame.isOffsetCoord && frameCenterInRad) {
-                            frame.wcsInfoShifted = AST.createShiftmapFrameset(frame.wcsInfo, frameCenterInRad.x, frameCenterInRad.y);
+                            frame.wcsInfoShifted = AST.createShiftmapFrameset(
+                                frame.wcsInfo,
+                                frameCenterInRad.x,
+                                frameCenterInRad.y,
+                                this.offsetCenter.x - frame.spatialTransform.translation.x,
+                                this.offsetCenter.y - frame.spatialTransform.translation.y
+                            );
                         }
                     }
                 }
@@ -2835,7 +2859,7 @@ export class FrameStore {
         if (this.isOffsetCoord && !this.wcsInfoShifted) {
             const centerInRad = getUnformattedWCSPoint(this.wcsInfo, this.center);
             if (centerInRad) {
-                this.wcsInfoShifted = AST.createShiftmapFrameset(this.wcsInfo, centerInRad.x, centerInRad.y);
+                this.wcsInfoShifted = AST.createShiftmapFrameset(this.wcsInfo, centerInRad.x, centerInRad.y, this.offsetCenter.x, this.offsetCenter.y);
             }
         }
 
diff --git a/src/stores/OverlayStore/OverlayStore.ts b/src/stores/OverlayStore/OverlayStore.ts
index e85755d09b..ac78791193 100644
--- a/src/stores/OverlayStore/OverlayStore.ts
+++ b/src/stores/OverlayStore/OverlayStore.ts
@@ -2,7 +2,7 @@ import * as AST from "ast_wrapper";
 import {action, autorun, computed, makeObservable, observable} from "mobx";
 
 import {WCSType} from "models";
-import {AppStore, PreferenceStore} from "stores";
+import {AlertStore, AppStore, PreferenceStore} from "stores";
 import {FrameStore, OverlayBeamStore, WCS_PRECISION} from "stores/Frame";
 import {clamp, getColorForTheme, toFixed} from "utilities";
 
@@ -32,7 +32,8 @@ export enum SystemType {
     FK4 = "FK4",
     FK5 = "FK5",
     Galactic = "GALACTIC",
-    ICRS = "ICRS"
+    ICRS = "ICRS",
+    Image = "CARTESIAN"
 }
 
 export enum NumberFormatType {
@@ -99,9 +100,12 @@ export class OverlayGlobalSettings {
         astString.add("Labelling", this.labelType);
         astString.add("Color", AstColorsIndex.GLOBAL);
         astString.add("Tol", toFixed(this.tolerance / 100, 2), this.tolerance >= 0.001); // convert to fraction
-        astString.add("System", this.explicitSystem);
+        const isWcsFrameAndSystem = typeof this.explicitSystem !== "undefined" && this.explicitSystem !== SystemType.Image && frame.validWcs;
+        if (isWcsFrameAndSystem) {
+            astString.add("System", this.explicitSystem);
+        }
 
-        if ((frame?.isXY || frame?.isYX) && !frame?.isPVImage && typeof this.explicitSystem !== "undefined") {
+        if ((frame?.isXY || frame?.isYX) && !frame?.isPVImage && isWcsFrameAndSystem) {
             if (this.system === SystemType.FK4) {
                 astString.add("Equinox", "1950");
             } else {
@@ -149,8 +153,17 @@ export class OverlayGlobalSettings {
         this.labelType = labelType;
     }
 
-    @action setSystem(system: SystemType) {
-        this.system = system;
+    @action async setSystem(system: SystemType) {
+        const frames = AppStore.Instance.frames;
+        if ((this.system === SystemType.Image) !== (system === SystemType.Image) && frames.map(f => f.spatialReference !== null).includes(true)) {
+            const confirm = await AlertStore.Instance.showInteractiveAlert("Switching system between world and image coordinates will disable spatial matching.");
+            if (confirm) {
+                frames.forEach(f => f.clearSpatialReference());
+                this.system = system;
+            }
+        } else {
+            this.system = system;
+        }
     }
 
     @action setDefaultSystem(system: SystemType) {
@@ -1021,7 +1034,7 @@ export class OverlayStore {
         autorun(() => {
             this.setFormatsFromSystem();
             AppStore.Instance.frames.forEach(frame => {
-                if (frame?.validWcs && frame?.wcsInfoForTransformation && this.global.explicitSystem) {
+                if (frame?.validWcs && frame?.wcsInfoForTransformation && this.global.explicitSystem && this.global.explicitSystem !== SystemType.Image) {
                     AST.set(frame.wcsInfoForTransformation, `System=${this.global.explicitSystem}`);
                 }
             });
@@ -1244,4 +1257,12 @@ export class OverlayStore {
             return renderHeight > 1 ? renderHeight : 1; // return value > 1 to prevent crashing
         };
     }
+
+    @computed get isWcsCoordinates() {
+        return this.global.explicitSystem !== SystemType.Image;
+    }
+
+    @computed get isImgCoordinates() {
+        return this.global.explicitSystem === SystemType.Image;
+    }
 }
diff --git a/src/utilities/wcs/wcs.ts b/src/utilities/wcs/wcs.ts
index 230ecca4bc..83a20d5b5d 100644
--- a/src/utilities/wcs/wcs.ts
+++ b/src/utilities/wcs/wcs.ts
@@ -2,7 +2,7 @@ import * as AST from "ast_wrapper";
 import {CARTA} from "carta-protobuf";
 
 import {Point2D, SPECTRAL_DEFAULT_UNIT, SpectralType, WCSPoint2D} from "models";
-import {NumberFormatType} from "stores";
+import {NumberFormatType, OverlayStore} from "stores";
 import {FrameStore} from "stores/Frame";
 import {add2D, magDir2D, polygonPerimeter, rotate2D, scale2D, subtract2D, trimFitsComment} from "utilities";
 
@@ -77,10 +77,20 @@ export function getFormattedWCSPoint(astTransform: AST.FrameSet, pixelCoords: Po
 
 export function getUnformattedWCSPoint(astTransform: AST.FrameSet, pixelCoords: Point2D) {
     if (astTransform) {
+        if (OverlayStore.Instance.isImgCoordinates) {
+            // need second frame(WCS frame) in the frame to get WCS point
+            AST.setI(astTransform, "Current", 2);
+        }
+
         const equinox = AST.getString(astTransform, "System") === "FK4" ? "1950.0" : "2000.0";
         AST.set(astTransform, `Equinox=${equinox}`);
         const pointWCS = transformPoint(astTransform, pixelCoords);
         const normVals = AST.normalizeCoordinates(astTransform, pointWCS.x, pointWCS.y);
+
+        if (OverlayStore.Instance.isImgCoordinates) {
+            AST.setI(astTransform, "Current", 1);
+        }
+
         if (normVals) {
             return normVals;
         }
diff --git a/wasm_src/ast_wrapper/ast_wrapper.cc b/wasm_src/ast_wrapper/ast_wrapper.cc
index 53ac362b18..29fae47aaa 100644
--- a/wasm_src/ast_wrapper/ast_wrapper.cc
+++ b/wasm_src/ast_wrapper/ast_wrapper.cc
@@ -52,6 +52,9 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getFrameFromFitsChan(AstFitsChan* fitschan, bo
         return nullptr;
     }
 
+    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(frameSet, 1);
+    astSet(pixFrame, "Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel)");
+
     // work around for missing CTYPE1 & CTYPE2
     if (checkSkyDomain) {
         const char *domain = astGetC(frameSet, "Domain");
@@ -104,7 +107,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getSkyFrameSet(AstFrameSet* frameSet)
     }
 
     // Create 2D base frame
-    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=Pixel axis 1,Label(2)=Pixel axis 2");
+    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel)");
     if (!baseframe)
     {
         cout << "Create 2D base frame failed." << endl;
@@ -180,10 +183,10 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createTransformedFrameset(AstFrameSet* wcsinfo
         return nullptr;
     }
 
-    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, 1);
+    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, AST__BASE);
     AstFrame* pixFrameCopy = static_cast<AstFrame*> astCopy(pixFrame);
-    AstFrame* skyFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, 2);
-    AstMapping* pixToSkyMapping = static_cast<AstMapping*> astGetMapping(wcsinfo, 1, 2);
+    AstFrame* skyFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, AST__CURRENT);
+    AstMapping* pixToSkyMapping = static_cast<AstMapping*> astGetMapping(wcsinfo, AST__BASE, AST__CURRENT);
     AstFrameSet* wcsInfoTransformed = astFrameSet(pixFrame, "");
 
     // 2D shifts
@@ -202,7 +205,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createTransformedFrameset(AstFrameSet* wcsinfo
     return wcsInfoTransformed;
 }
 
-EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapFrameset(AstFrameSet* wcsinfo, double offsetX, double offsetY)
+EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapFrameset(AstFrameSet* wcsinfo, double offsetX, double offsetY, double pixelOffsetX, double pixelOffsetY)
 {
     AstFrameSet* wcsinfoShifted = static_cast<AstFrameSet*> astCopy(wcsinfo);
 
@@ -211,19 +214,24 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapFrameset(AstFrameSet* wcsinfo, d
     AstShiftMap* shiftMap = astShiftMap(2, offset, "");
 
     // remapping
-    astRemapFrame(wcsinfoShifted, AST__CURRENT, shiftMap);
+    astRemapFrame(wcsinfoShifted, 2, shiftMap);
 
-    AstSkyFrame *skyframe = static_cast<AstSkyFrame*>astGetFrame(wcsinfoShifted, AST__CURRENT);
+    AstSkyFrame *skyframe = static_cast<AstSkyFrame*>astGetFrame(wcsinfoShifted, 2);
     astSet(skyframe, "SkyRefIs=Origin");
 
+    // 2D pixel shifts
+    double pixelOffset[] = {-pixelOffsetX, -pixelOffsetY};
+    AstShiftMap* pixelShiftMap = astShiftMap(2, pixelOffset, "");
+    astAddFrame(wcsinfoShifted, AST__BASE, pixelShiftMap, astFrame(2, "Label(1)=X offset coordinate (pixel),Label(2)=Y offset coordinate (pixel),Domain=GRID"));
+
     return wcsinfoShifted;
 }
 
 EMSCRIPTEN_KEEPALIVE AstFrameSet* initDummyFrame()
 {
-    double offsets[] = {-1, -1};
+    double offsets[] = {0, 0};
     AstFrameSet* frameSet = astFrameSet(astFrame(2, ""), "");
-    astAddFrame(frameSet, 1, astShiftMap(2, offsets, ""), astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=PIXEL"));
+    astAddFrame(frameSet, 1, astShiftMap(2, offsets, ""), astFrame(2, "Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel),Domain=PIXEL"));
     return frameSet;
 }
 
diff --git a/wasm_src/ast_wrapper/index.d.ts b/wasm_src/ast_wrapper/index.d.ts
index 0cd245b07b..c748b004d1 100644
--- a/wasm_src/ast_wrapper/index.d.ts
+++ b/wasm_src/ast_wrapper/index.d.ts
@@ -56,7 +56,7 @@ export function addFrame(frameSet: FrameSet, index: number, map: Mapping, frame:
 export function setI(obj: AstObject, attrib: string, value: number): void;
 export function setD(obj: AstObject, attrib: string, value: number): void;
 export function createTransformedFrameset(frameSet: FrameSet, offsetX: number, offsetY: number, angle: number, originX: number, originY: number, scaleX: number, scaleY: number);
-export function createShiftmapFrameset(frameSet: FrameSet, offsetX: number, offsetY: number);
+export function createShiftmapFrameset(frameSet: FrameSet, offsetX: number, offsetY: number, pixelOffsetX: number, pixelOffsetY: number);
 // Not exported fillTransformGrid()
 export function makeSwappedFrameSet(originFrameSet: FrameSet, dirAxis: number, spectralAxis: number, pixelZ: number, nsample: number): FrameSet;
 
diff --git a/wasm_src/ast_wrapper/post.ts b/wasm_src/ast_wrapper/post.ts
index b057644af2..6e3d4c243e 100644
--- a/wasm_src/ast_wrapper/post.ts
+++ b/wasm_src/ast_wrapper/post.ts
@@ -129,7 +129,7 @@ Module.addFrame = Module.cwrap("addFrame", null, ["number", "number", "number",
 Module.setI = Module.cwrap("setI", null, ["number", "string", "number"]);
 Module.setD = Module.cwrap("setD", null, ["number", "string", "number"]);
 Module.createTransformedFrameset = Module.cwrap("createTransformedFrameset", "number", ["number", "number", "number", "number", "number", "number", "number", "number"]);
-Module.createShiftmapFrameset = Module.cwrap("createShiftmapFrameset", "number", ["number", "number"]);
+Module.createShiftmapFrameset = Module.cwrap("createShiftmapFrameset", "number", ["number", "number", "number", "number"]);
 Module.fillTransformGrid = Module.cwrap("fillTransformGrid", "number", ["number", "number", "number", "number", "number", "number", "number", "number"]);
 Module.pointList = Module.cwrap("pointList", "number", ["number", "number", "number", "number", "number"]);
 Module.axPointList = Module.cwrap("axPointList", "number", ["number", "number", "number", "number", "number", "number", "number"]);