removed bundle_disabled (second try)