Fix for broken leader stuff