Fix #273
Merge pull request #320 from aesedepece/fix-for-issue-273

Fix for issue 273