Fixed a bug in the matrix building
more investigation into over-sensitivity