Join handler more sensible