Try and fix logging