Hotfix/sistrix wip2

after that we will merge this directly into master