Fixed issue with group sharing