Addressed another review comment by Sean.