Missing fields bug fixed