Fix to the fix
Merge pull request #354 from NickMcConnell/master

Fix to the fix