added check for 'comment'