Fix bug where I2C address was being overridden