Fix to be comparable with new packaging system