Fix for #344 done from master because I'm an idjit
Merge pull request #352 from TheMightyBuzzard/master

Fix for #344 done from master because I'm an idjit