Even better fix for missing tags or by