Workaround for iterator bug.