Add fix for leader lock issue