If you have time to fix the hack independent of modifying that code for a specific need then you should be asking what else you could be working on. Fix it late

If you have time to fix the hack independent of modifying that code for a specific need then you should be asking what else you could be working on. Fix it later implies resource availability which is an alien concept for project managers.