Merge pull request #1610 from nabinhait/v4-hotfix

minor fix