rivert changes fix