Fixed SPARK-4519