fix empty issues