Fixing issue with missing domain