fix empty issue