Final bug fixed - I hope ;-)