fixed this issues