Fixed save for #15