Fixing msft bug with null values