Merge pull request #1260 from nabinhait/hotfix

Hotfix