My fix, it's for https://issues.apache.org/jira/browse/SPARK-1749