bugfix over bugfix :(