fixed loading bug
Merge branch 'develop' into stage