Attempted fix by removing pagination