Fixed command breakage