Fix issue with Having null children
Merge