Fix duplicate field issue MJ-262