Merge pull request #1996 from nabinhait/hotfix

Fixes