fix command messages