Fixed a bug with matrices macros asking class names