Take2 on matrix build