Fix for empty issues