bug fix, provide fast exit