Fixed Calculate on switch