SM-8158 delegate / missing tag