Added check for switch default