Not elegant, but fixed the last comment child bug