Actually fixed the onJoin Issue this time