Address Antti's review comment.