Merge pull request #1586 from nabinhait/v4-hotfix

V4 hotfix