SPI level fix for issue #863.