Fixed problem with state check after redirect
Merge branch 'Hotfix/state-verification'