Attempt to fix party management