Fix join()