Log fix
Logging improvement
Bugfix