Prevent double join bug