Fix var ordering