fix refact1