Fix recalculate