fixed problem with null data