fix dependency order