FIX: issue #389 (switch/default broken)