CComments Integration fix