fixing join class