Fix for Issue #2199
Merge pull request #2200 from totallyeviljake/develop

Fix for Issue #2199