tried to fix pager issue but reverted