Added some changes to make things not broken for others[#45149757]