Hopefully this will fix PR98