Fix an error when exiting
Fix an error when exiting
Merge branch 'develop'