Ok 80% sure this should do it...

I think...
Merge pull request #967 from RlonRyan/patch-1

Ok 80% sure this should do it...