bugfix seems to work