fix bug and add field