#38. Vote - fixes