Merge pull request #2106 from phil65/PVR-Fix