Shadow dom fix done