Improved force quitting