You don't have to fix getItems() in this pull request, but your new code should do it the right way and not copy a bug.