A fix to map