FIx some bug