Fix event subscriber registration