quick patchup for 1.420