resolved race condition with an interval
Merge branch 'hotfix/typeerror-rendered'