It sounds not like a follow-up, but an existing issue even without this patch and it would be good to improve it in the future.