Fix bug SPARK-864