fix can't load modules
Merge branch 'develop'