Fixes recent regression