Possible fix again, now with more logging