Attached is a proposed patch for this bug. It is not fancy, but it works for me.