Patch #25 works for me.