Automatic marks remap