fix handling of lack of data