fix empty  issue