Fixed domain to use core if null