bugfix
work in progress...