Fix mapping problem