Added workaround for paths withs spaces.