Small fix backported from Candy Basket work