Merge pull request #1302 from nabinhait/hotfix

Hotfix