Fix the SaveItem method