Address reviewer #3, comment #4