fix DOMAIN issues