should fix recalc