Improved R3 auto redirect