Worked arount SPARK-2678