Fix logging?