Fixing domain problems