Resolve exit with q/Q issue