Fixed event loop duplication