(patch enclosed as an attachment, so don't know if it's visible on boards)

-paul-