Some autoend voting fix