generalized the snippet, applied it at comments,  working nicer now