fixed to handle default bundle