Fixed listeners not getting correctly injected when using SPF.