bugfix matrix