Fix bug with mapping.