This constant remapping is indeed a pita