Exit bug fixed