Fix mapping issue by moving leader-mappings to top.