* Fixed join to handle keys properly