Merge pull request #4312 from wsoltys/pvrfix