Fix rework