handle null content
1.7 -> 1.6