wrong object use and removal of some logging