fixed or bug and added set