Patch 3.4.12 ... again...