Fixing transition for switch. Fixes #405