#2 - thanks to SebCorbin - Very ugly fix