Resolve comments of PR#1371