Need to check the quit flag here too
Tab fix