More possible fixes for the Command loop