Another switching bug