fixing bundle issues.