add if for empty members