bugfix leftover from legacy implementation