Fixed issue #3. Workaround for Strings in switches.