Attempt to fix the mess... was working?