Merge pull request #2870 from nabinhait/fix1

Fixes