Fix on STL saving