Fixing my own mess