Fixed bug with too much render calls
Merge branch 'hotfix/fix-multiple-redirection-bug'