Fixed Extracting to wrong location