Merge pull request #2145 from nabinhait/hotfix

Minor fixes