Finally fix PVR

Change-Id: I6a2dc9ba92dd181dc7d1b83762e9205a4039aec5