Removed bug in iterator(wrong order)