Merge pull request #3761 from nabinhait/fix1

Fixes