Fix for paths containing spaces