Fix var support