resolve comment bugs