Same note about logging here (I think the conditional is incorrect too?)