Fix remaps (again)