Fixed dependency order of variables