Enclosure can be None fix