Address Alive's review comment