Fixed handling of back'n'forth mappings