Fix with no pagination