XX-10975 Fixed saving