Fix listener check redirect
Merge branch 'hotfix/checkRedirect'