Fix for #2327
Merge pull request #2329 from werk85/master

Fix for #2327