Fixed bug & error to list