Avoided redundant EngineController creation
Merge pull request #1590 from Benglin/master

Avoided redundant EngineController creation