fixed recalc issue