Merge pull request #1589 from nabinhait/v4-hotfix

V4 hotfix