Fixed problem with different directory names