hopefully fixed matrix for 32/64-bit  setup