bugfix remaps which shouldn't remap, closes #61.