Merge pull request #1968 from nabinhait/hotfix

Fixes