Fix for duplicated comments