Fixes extracting

Extracting is now fixed. Commit 41b0211 has been reverted as of this extraction fix.