Fix return value for map