Fixing commenting issue