bugfix && removed logging