Hopefully fixes the package issues