Fix command slicing