Add an option to disable reseting of the target