Some fix for comments(name showed)