Improve 0-member case