Hopefully this fixes more than it breaks.