Fix extracting