List fixed (18/25)

List fixed