Fixes #1429
Improve logging