Fix issue #3204
Merge pull request #3209 from lancedikson/master

Fix issue #3204