I'll add an issue to do it later as an improvement