Attempt at fixing the mess