Fixing ExecutionStatus properly setting