Fix some bug again