* Fixing logging