fixed dynamic join support