Fixes #2850
Merge pull request #2851 from sumobi/issue/2850

Fixes #2850