Bit of improvement on logging timeout