Probably correct fix, needs to be verified
Improve the formulas
Correct fix