Fixing pagination on develop