Fixing bad logic for matrix access....