Fix bundle extraction