fix status saving