PV Crash fix (all buttons too)