Fix some some bug