HashMatrix fix