Fix adding listener