with fix for matrix sub/super diagonals passing