Fixed empty tag bug