Upstream events now working properly.