Protect against macrostate collision
3.3.0