Added logging condition back to avoid ruining it for everybody