add more logging, possibly fix issue