Composition of directories fixed