More correction to matrix builder