fixed accidental regression during merge