bug fix caused by paginator