Fix bundle issue