Paginator ticket #12 - fixed