Fix remap time counter