Fixed event handler