take two on build matrix