Fixed comments #2 of PR