Fixed join listener order