fix loader
Merge branch 'develop'