Domain bug fix -kwh