Bug fix for running with custom Spark version