Re-Fix part2