Bundling: Fixed #1083