fixed some issues with bundle