Small bugfix for correct old `expand = true handling