Fixed event bus / generics problem.