Fix #123 move mappings