Fix saved attributes as Shaul suggested