patching to 3.4.18