Resolved some bundle issue