Fix only support one field