fixed enclosure handling