Change to improve speed of _fixupChildren