Fix normal exit