even better performance fix, now it's actually usable