SSP-1069 Fixes a bug when no Map