fixed encoding problems in bundles