Improved redirect following