Address @carreau 's comments