Bugfix
Minimal logging added