Fix/2.6/unpackdir