Fix the nomination system