Fixed return to simple mode in new file.