Cleaner fix for redirect issue