Fix ODControl broken, close issue #38