Fix issue #1224
Merge pull request #1225 from hurtonm/master

Fix issue #1224