Fixing paginator part II