Apply @voisardf's review