Fix save into DB