Fix some part