Fix field-limiting [ASFXNB174] [to master]