fix issues from:
https://forge.epn-campus.eu/issues/1848