Fix limit 30 problem