Attached is a proposed patch, which works for me.