Command Fix up