Fixed matrix propagation issue