fixed iterator class