Repairing hacks for easy fixes!