Fix 664

This will unfortunately start to clutter up the system with lots of temporary directories because they never get cleaned up, could this pass around the `TempDir` instance as well to auto-clean-up?