Add some additional logging per issue #1