2nd try to fix power button handling