fix exit bug
Merge branch 'hotfix/fix_exit'