Master-Slave switch bugfix