Fix issue with directories