                         ChartUtils.drawText(context: context, text: data.xVals[j]!, point: CGPoint(x: x, y: y + lineHeight), align: .Center, attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor])
                     }
                 }
-                else if (drawXVals && !drawYVals)
+                else if (drawXVals)
                 {
                     ChartUtils.drawText(context: context, text: data.xVals[j]!, point: CGPoint(x: x, y: y + lineHeight / 2.0), align: .Center, attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor])
                 }
-                else if (!drawXVals && drawYVals)
+                else if (drawYVals)
                 {
                     ChartUtils.drawText(context: context, text: val, point: CGPoint(x: x, y: y + lineHeight / 2.0), align: .Center, attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor])
                 }

        
        for (var j = 0; j < entryCount; j++)
        {
            let sliceAngle = drawAngles[cnt]
            let sliceSpace = dataSet.sliceSpace
            
            guard let e = dataSet.entryForIndex(j) else { continue }

        let phaseX = animator.phaseX
        let phaseY = animator.phaseY
        
        let entryCount = dataSet.entryCount
        var drawAngles = chart.drawAngles
        let circleBox = chart.circleBox
