Hack for fix-map-operation