Fixed comments #1 of  PR