Maybe refer to 1471 here, so when someone sees this again, they can check whether the issue still exists