Merge branch 'bugfix/issue_87' into 'develop'

Fix for issue #87.

See merge request !99
Status Job ID Name Coverage
  External
passed jenkins

00:01:00

passed jenkins

00:01:00

passed jenkins

00:00:53