fixed domain resolution
cleaned