Matrix creation changed since 3.1