second bugfix. hope last