Use the right bundle class.