Fix logging ...