v5.8.64 - finally fix the NPE from #58