Fix Join Class