Address reviewer #3, comment #5