Added additional logging, to help with a bug