I agree it's not the best but it's been like that since 2.10.1. Should I change it just here?