We have to check also for the ModelNode, but we also have to avoid recursion. Reviewed-by: Marco Bubke