Merge pull request #2091 from nabinhait/hotfix

Minor fixes