I'm not sure it's really helpful for this case. maybe we can merge this patch and see what happens.