fixing domain issues