Files containing spaces are still broken