Change to EXIT_ON_CLOSE