fix null field issue
resolve symbol clash