Fix should be prepares for null values