Fix threads saving