Fix auto join with keys not working