Fixed #3283
Merge pull request #3318 from nukkumatti/issue-3283

Fixed #3283