ExecutionEngine fix from snormore.