Correct comment data passing