Bug extra_files deletion in working directory fixed