Command bug fix