Resolve issue 390059
Merge pull request #89 from JNPA/feature/390059

Resolve issue #88