fixed comment(1) and (8) #3