fixed issue with null values