Fix commands not recognizing controller in PM