fix for flattening of comments