Bug Fix Duplicated Comments