Fixed no listener case