Fixed matrix finally