Fixed join to group bug