fixed fields bug