fix for group too