Quickfix for comment data