Trying to fix domain issue