Fixed extract bug with filenames containing spaces