Comments problems fixing