#52 Quick and dirty fix that avoids trying to process a bundle