Fix variable handler