Bugfix for 1080306
Merge pull request #2723 from theharshest/bug-1080306

Bugfix for 1080306