Fix for not set tags