Domain removal fix