Revert calculation
Fixed calculation