Small tweak to power handler