Fixed pagination after library upgrading