Fixing domain check