Corrected handling of add-ons.