Bundle fix