Merge pull request #4266 from saurabh6790/fixes1

[fixes] args fixes