Nullability fixed