Merge pull request #1957 from nabinhait/hotfix

Hotfix