Use remaps more
Fix Issue #279