[FIX] Some bugs
FIX