Added check for comments