Whoops forgot to uncomment matrix hack for debugging; fixed now.