The rules of maths don't change but you have not read correctly the way the tax will be applied.
As I understand it:
($Ending value - $Starting value + any withdrawals - after tax contributions) / $Starting value = amount subject to surcharge.
An additional tax surcharge of 15% is then applied to this calculation.
