remove special case with null values