No more rage quit (maybe)