Fix for issue #242 AGAIN
Merge pull request #272 from aesedepece/fix-for-issue-242-b

Fix for issue #242 AGAIN