Fixed problema mapping