Fix for multiple paginator support