Supermatter fixes
Merge pull request #2323 from N3X15/fix-supermatter

Supermatter fixes