Fix: Better dummy behaviour on switches