Try to fix lack of bundling