Fix for comments

@vforge, looks like a good candidate for selectors caching