more wip on bugfix