Address @bthirion's remarks