Fix if original dir contains spaces