Fixed variables in comment feature