Added statement to ensure proper groupmembership