Fixed problem with mapping