Fix Comment Caller bug