Feature/fix redirect