Fix Automated SPI Location switching