Resolve domain (36/38)

Resolve domain