Fixed bundle issue