Working on a fix for logging.