Move save handler further up to avoid issues.