FIX - Correctly handle spaces in path