Merge pull request #1251 from nabinhait/hotfix

Hotfix