Hi Chen,

> The attachment is my patch, the comments and the debug info can be
> removed as soon as this patch is tested fully.

and your patch is quite too complex. Mine consists of three additional
lines only.

Regards

Marcel