apply review comments. #996 #1103