Fix commands again