Handling HasChild ES bug, closes #585