Fixed Join Errors