Fix the way we track members