Fix bundle class