Fix matrix crap