Add some logging
Bugfix