[#19] One step further - still have redirection issues.