bugfix + logger completed