+ slight tweak for later Settings bundle support