Fix command breakage