Events still not completely thread-safe