okay, second bugfix attempt