RE: Fixing "breaking packages"