Matrix data fix