Fix ; remapping