Fix issue #1257
Merge pull request #1262 from hurtonm/master

Fix issue #1257