fix functionality broken by @46e90ddff8