Added temporary fix to SPARK-2025 until SPARK gets updated and recompiled