revert matrix and fix components