fix forever error
Merge branch 'hotfix/errorfix2'