When data is nil fix