Merge pull request #1630 from nabinhait/v4-hotfix

fixes