Fixed issue with incorrect domains being used