Address erik's review comment.