Fix commander