Trying to fix the comments issue