Fix for comment problem