SPARK-3732# Fix for SPARK-3732