Fixed recalculation