refixed version