patched up to 3.4.20