Fix multiple comment issue