fix undefined variables in comment-form