Fix not iterable bug