Once more stupid overflow tweak