Fixed run-local-safe