Solve issues #186 and #187

Merged Nicola Nadine Döring requested to merge doeringn/mhm:Fix_issue_186_187 into develop

Merge request reports