Is this issue resolved in 2022?