Fix bundle problem