Trying to fix domain issues