Fix for 1.6 and fallback if no redirect is given.