Fixed mapping error