Matrix fix