second bugfix