Fix to set ExecutionUnit properly