#497 bundle works