Fix CommandT