Regression fix: two factor setup wouldn't complete