Fixes SPARK-4182