Fix regression with issue #283
Merge pull request #295 from trevorbernard/master

Fix regression with issue #283