Hot fix for lack of PM commands