fix nulls coming back