fields bug fix