HACK: annoying zeptobug fixed by double hack
(cherry picked from commit aca11d0cc91e3d9f2e2726393e8999537d6fb5fa)