finally fixed issue with data not matching