fixed DispatcherEvents.. again