Fix last update to reflect latest code