Fix some bug !