fix phase one problem