fix generic method remapping