Fix "Creating default object from empty value"