Would love to get this fixed before the end of 2022