Fix for package not loading properly