Bugfix. [Delivers #67450892]
Merge pull request #3 from thejchap/integration

Bugfix. [Delivers #67450892]