Bugfix: Index out of bounds exception with the Retriever, fixes #136