Fixed issue with group sync