Address reviewer comment