Fix the last issue with QUIT operation