Bundled dirty fix