avoid #177
Merge branch 'hotfix/loading-animation-again'