Fixed some strange bundle issue