Fix critical error on first run
Merge branch 'develop'