Fix SPARK-2258