Fixed scoped comment_data