Fixed potential erroneous event source removal