Address reviewer #5, comment #1 and #2