Fixed saving & return for #15