Fixed issue with return type in wrapped iterator