No more EXIT_ON_CLOSE