this should fix the problem from the matrix change