Fixes #2646
Merge pull request #2647 from sumobi/issue/2646

Fixes #2646