U4-4949 - fix issue with domains