SFO: Fixed numerical issues