Fix issue with logging