fix for comment issues