Addressed Patrick's comment as this patch is targeted for spark 1.0