alternate bugfix attempt