>Therefore, I have prepared a patch that could solve both of these 
>problems. Please, test it.

I will test. Will be a few hours before I can provide results.

Darrell