more ugly code, 1 test broken