Reverted max num fields to 1500