Commit I should have done since a long time and don't remember why I didn't do it