Fixed event logger infinite loop