Fixed a bug that was illuminated by remiX
Fixed Version issue
Ugh another one, I'm to tired for this.