Fixing bugs related to the voting flaws