Address @voisardf's review