Fix issue #15, for switch token