Fixed #299; Reverse not needed, corrected mappings