fixed redirect
Merge branch 'hotfix/fix-redirection' into develop

* hotfix/fix-redirection:
  fixed redirect