old merge missed some changes, fixed it