Merge pull request #1388 from nabinhait/hotfix

Hotfix