Fix to include the suffix in the directory name.