Fix CommandTimeout bug