fix bug & remove exit