Fixxed JOIN Bug