diff --git a/Charts/Classes/Data/CandleChartDataSet.swift b/Charts/Classes/Data/CandleChartDataSet.swift
index ad1c2b11df..6d1a59d159 100644
--- a/Charts/Classes/Data/CandleChartDataSet.swift
+++ b/Charts/Classes/Data/CandleChartDataSet.swift
@@ -62,7 +62,7 @@ public class CandleChartDataSet: BarLineScatterCandleChartDataSet
         }
         else
         {
-            endValue = end
+            endValue = end > (entries.count - 1) ? (entries.count - 1) : end
         }
         
         _lastStart = start
diff --git a/Charts/Classes/Renderers/CandleStickChartRenderer.swift b/Charts/Classes/Renderers/CandleStickChartRenderer.swift
index 7747fa8c9b..5603849b0e 100644
--- a/Charts/Classes/Renderers/CandleStickChartRenderer.swift
+++ b/Charts/Classes/Renderers/CandleStickChartRenderer.swift
@@ -194,8 +194,8 @@ public class CandleStickChartRenderer: ChartDataRendererBase
                 var entryFrom = dataSet.entryForXIndex(_minX)
                 var entryTo = dataSet.entryForXIndex(_maxX)
                 
-                var minx = max(dataSet.entryIndex(entry: entryFrom!, isEqual: true), 0)
-                var maxx = min(dataSet.entryIndex(entry: entryTo!, isEqual: true) + 1, entries.count)
+                var minx = max(_minX, 0)
+                var maxx = min(_maxX + 1, entries.count)
                 
                 var positions = trans.generateTransformedValuesCandle(entries, phaseY: _animator.phaseY)
                 
diff --git a/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib b/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
index b439e57460..f96cd335d3 100644
--- a/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
+++ b/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7519.1" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7513.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CandleStickChartViewController">
@@ -34,13 +34,13 @@
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
-                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="2500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
                     <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
-                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="2500" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
                     <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>