fix for null data