fixed problem with not correct data