Made local running more safe