bug with CommandType - fixed.