remap bug fixed