Wouldn't the return command and bloodporting get around your fixes?