bugfix:leader remap