Object save fix