Fix bid error and deleting wizard causing command button to be deleted