New fix for #74
With better explnations come better fixes :D