Is it really a good place to correct this ? Maybe we should at this in a different commit or PR?