Should work for all matrices now