rework to fix