Fixing the solution