fix command structure