Fixed duplicate empty message