(unfinished) bugfix