Fix for paths with spaces