fix bug and issue