fix bug and go on