[DF-2856] Fixed wrong indexing at Library