Attached is a suggested patch to fix it.

comments welcomed,
 - assaf