Patch #27 works for me.