Class List fixed