Bug fixed (again), now to check the results (again). :-)