fix bug on startup
Merge branch 'develop'