[FIX] repair bugs