Merge pull request #1609 from nabinhait/v4-hotfix

V4 hotfix