fixed underscore issue in new inclusions