Fixed comment binding to variables