Fix to allow paths with spaces