Fix listeners adapters