We should fix them at the root when we notice them