Fixing status save