Fuckup
Fix Add Group by JoinCode