Fix missing field issue