Upsell bug fix