Revert "also return nothing if r2 is infinity"

This reverts commit d61d24e78b9d2d1c98dedc3ef389f4751cc8898c.
use the right methods