Fix bug of missing iterator class