Fix Event Bus Hopefully