#96 Don't log prematurely