I will try out moving the code around as your patch suggest. I don't expect it will cause trouble. ron