Fixes issue with empty tags