I have reformatted the two bug fixes I attached earlier.

Nico