Fix to map