Fix bug on paths with spaces... again