fis some bug