 
         // Transform degrees to their translated compass direction
         switch degree {
-        case 340...360, 0...20:
+        case 340..<360, 0..<20:
             return directions["north"]!
         case 20..<70:
             return directions["northeast"]!
-        case 70...110:
+        case 70..<110:
             return directions["east"]!
-        case 110...160:
+        case 110..<160:
             return directions["southeast"]!
-        case 160...200:
+        case 160..<200:
             return directions["south"]!
         case 200..<250:
             return directions["southwest"]!
-        case 250...290:
+        case 250..<290:
             return directions["west"]!
         case 290..<340:
             return directions["northwest"]!

        let modifierConstant =
            (((instructions["constants"]) as! NSDictionary)["modifier"] as! NSDictionary)[modifier ?? "straight"] as! String
        var bearing: Int? = nil
        if (step.finalHeading != nil) { bearing = Int(step.finalHeading! as Double) }

        // Replace tokens
        let scanner = Scanner(string: instruction)
        scanner.charactersToBeSkipped = nil
        var result = ""
        while (!scanner.isAtEnd) {
            var buffer: NSString?

            if scanner.scanUpTo("{", into: &buffer) {

                case "way_name": result += wayName
                case "destination": result += destination
                case "exit_number": result += exit
                // TODO: Enable once rotary_name exposed in MBRouteStep
                // case "rotary_name": result += step.rotaryName ?? ""
                case "lane_instruction": result += laneInstruction ?? ""
                case "modifier": result += modifierConstant
