Fix to avoid double level of directories.