Merge pull request #2099 from nabinhait/hotfix

Minor fixes