fix handing of filesystem objects