Fixed a issue when the specify 'yogafire'
Merge branch 'develop'