Fix a giant mess