Hotfix/bugfixes #125

Closed tohasim closed 1 year ago